From 3411287ebd8b1c2fbd9b695515778132e7cadd8a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 12 Nov 2004 03:39:02 +0000 Subject: [PATCH] Don't try to use xdgmime on Windows where we don't build it. (#157944, J. 2004-11-11 Matthias Clasen * gtk/gtkfilefilter.c: Don't try to use xdgmime on Windows where we don't build it. (#157944, J. Ali Harlow) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkfilefilter.c | 6 ++++++ 5 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index f48edfe0c0..ac4a736aa0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-11-11 Matthias Clasen + * gtk/gtkfilefilter.c: Don't try to use xdgmime on + Windows where we don't build it. (#157944, J. Ali Harlow) + * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also reserve space for the resize grip if the grip_window is not realized yet. (#158010, Christian Persch) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f48edfe0c0..ac4a736aa0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-11-11 Matthias Clasen + * gtk/gtkfilefilter.c: Don't try to use xdgmime on + Windows where we don't build it. (#157944, J. Ali Harlow) + * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also reserve space for the resize grip if the grip_window is not realized yet. (#158010, Christian Persch) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f48edfe0c0..ac4a736aa0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-11-11 Matthias Clasen + * gtk/gtkfilefilter.c: Don't try to use xdgmime on + Windows where we don't build it. (#157944, J. Ali Harlow) + * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also reserve space for the resize grip if the grip_window is not realized yet. (#158010, Christian Persch) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f48edfe0c0..ac4a736aa0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-11-11 Matthias Clasen + * gtk/gtkfilefilter.c: Don't try to use xdgmime on + Windows where we don't build it. (#157944, J. Ali Harlow) + * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also reserve space for the resize grip if the grip_window is not realized yet. (#158010, Christian Persch) diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c index 561b6fa4d8..1a4769c70b 100644 --- a/gtk/gtkfilefilter.c +++ b/gtk/gtkfilefilter.c @@ -26,8 +26,10 @@ #include "gtkobject.h" #include "gtkprivate.h" +#ifdef G_OS_UNIX #define XDG_PREFIX _gtk_xdg #include "xdgmime/xdgmime.h" +#endif typedef struct _GtkFileFilterClass GtkFileFilterClass; typedef struct _FilterRule FilterRule; @@ -406,7 +408,11 @@ gtk_file_filter_filter (GtkFileFilter *filter, { case FILTER_RULE_MIME_TYPE: if (filter_info->mime_type != NULL +#ifdef G_OS_UNIX && xdg_mime_mime_type_subclass (filter_info->mime_type, rule->u.mime_type)) +#else + && strcmp (rule->u.mime_type, filter_info->mime_type) == 0) +#endif return TRUE; break; case FILTER_RULE_PATTERN: -- 2.30.2